config: Add default values

Signed-off-by: Phoevos Kalemkeris <[email protected]>

Author: phoevos

cogstack_model_gateway/common/config.py

@@ -9,27 +9,28 @@
 CONFIG_FILE = os.getenv("CONFIG_FILE", "config.json")
 ACCEPTED_ENVIRONMENT_VARIABLES = {
     "cms": {
-        "CMS_PROJECT_NAME",
-        "CMS_HOST_URL",
+        "CMS_HOST_URL": "",
+        "CMS_PROJECT_NAME": "cms",
+        "CMS_SERVER_PORT": "8000",
     },
     "cmg": {
-        "CMG_DB_USER",
-        "CMG_DB_PASSWORD",
-        "CMG_DB_NAME",
-        "CMG_DB_HOST",
-        "CMG_DB_PORT",
-        "CMG_OBJECT_STORE_HOST",
-        "CMG_OBJECT_STORE_PORT",
-        "CMG_OBJECT_STORE_ACCESS_KEY",
-        "CMG_OBJECT_STORE_SECRET_KEY",
-        "CMG_OBJECT_STORE_BUCKET_TASKS",
-        "CMG_OBJECT_STORE_BUCKET_RESULTS",
-        "CMG_QUEUE_USER",
-        "CMG_QUEUE_PASSWORD",
-        "CMG_QUEUE_NAME",
-        "CMG_QUEUE_HOST",
-        "CMG_QUEUE_PORT",
-        "CMG_SCHEDULER_MAX_CONCURRENT_TASKS",
+        "CMG_DB_USER": "admin",
+        "CMG_DB_PASSWORD": "admin",
+        "CMG_DB_NAME": "cmg_tasks",
+        "CMG_DB_HOST": "postgres",
+        "CMG_DB_PORT": "5432",
+        "CMG_OBJECT_STORE_HOST": "minio",
+        "CMG_OBJECT_STORE_PORT": "9000",
+        "CMG_OBJECT_STORE_ACCESS_KEY": "admin",
+        "CMG_OBJECT_STORE_SECRET_KEY": "admin123",
+        "CMG_OBJECT_STORE_BUCKET_TASKS": "cmg-tasks",
+        "CMG_OBJECT_STORE_BUCKET_RESULTS": "cmg-results",
+        "CMG_QUEUE_USER": "admin",
+        "CMG_QUEUE_PASSWORD": "admin",
+        "CMG_QUEUE_NAME": "cmg_tasks",
+        "CMG_QUEUE_HOST": "rabbitmq",
+        "CMG_QUEUE_PORT": "5672",
+        "CMG_SCHEDULER_MAX_CONCURRENT_TASKS": "1",
     },
 }
 
@@ -85,18 +86,17 @@ def load_config() -> Config:
             with open(CONFIG_FILE) as f:
                 config = json.load(f)
         except FileNotFoundError:
-            log.error(f"Config file {CONFIG_FILE} not found.")
-            raise
+            log.warning(f"Config file {CONFIG_FILE} not found.")
+            config = {}
         except json.JSONDecodeError:
             log.error(f"Config file {CONFIG_FILE} is not a valid JSON file.")
             raise
 
         load_dotenv()
         for key, env_vars in ACCEPTED_ENVIRONMENT_VARIABLES.items():
             config[key] = {
-                var.replace(f"{key.upper()}_", "", 1).lower(): value
-                for var in env_vars
-                if (value := os.getenv(var))
+                var.replace(f"{key.upper()}_", "", 1).lower(): os.getenv(var, default)
+                for var, default in env_vars.items()
             }
         log.info(f"Loaded config: {config}")
         _config_instance = Config(config)

tests/unit/common/test_config.py

@@ -1,6 +1,11 @@
 from unittest.mock import mock_open, patch
 
-from cogstack_model_gateway.common.config import Config, get_config, load_config
+from cogstack_model_gateway.common.config import (
+    ACCEPTED_ENVIRONMENT_VARIABLES,
+    Config,
+    get_config,
+    load_config,
+)
 
 TEST_ENV_VARS = {
     "CMS_HOST_URL": "http://localhost:8000",
@@ -81,12 +86,12 @@ def test_load_config(mock_load_dotenv, mock_getenv, mock_open):
     assert config.key == "value"
 
     assert "cmg" in config
-    assert len(config.cmg) == 1
+    assert len(config.cmg) == len(ACCEPTED_ENVIRONMENT_VARIABLES["cmg"])
     assert "db_user" in config.cmg
     assert config.cmg.db_user == "test_user"
 
     assert "cms" in config
-    assert len(config.cms) == 1
+    assert len(config.cms) == len(ACCEPTED_ENVIRONMENT_VARIABLES["cms"])
     assert "host_url" in config.cms
     assert config.cms.host_url == "http://localhost:8000"
 
@@ -99,7 +104,9 @@ def test_load_config_no_env_vars(mock_load_dotenv, mock_getenv, mock_open):
     config = load_config()
     assert isinstance(config, Config)
     assert config.key == "value"
-    assert not config.cmg and not config.cms
+    assert "cmg" in config and "cms" in config
+    assert len(config.cmg) == len(ACCEPTED_ENVIRONMENT_VARIABLES["cmg"])
+    assert len(config.cms) == len(ACCEPTED_ENVIRONMENT_VARIABLES["cms"])
     config.set("nested", {"inner_key": "inner_value"})
     assert isinstance(config.nested, Config)
     assert config.nested.inner_key == "inner_value"